Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 31 May 2010 22:50:25 +0000 (22:50 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 31 May 2010 22:50:25 +0000 (22:50 +0000)
commitdac35722ad4748ec3e65e7949a7e75ebdf7cc431
tree0c963e09808f28f45a2d3873a65b9f57e0bbecaa
parentd7e5b20b79d479a21096f13590eb3f767c896711
parentb0191f43f9ecce5e357541c72f4cf171c41681e0
Merge from mainline.